Merge branch 'master' into frameworks

Authored by apol on May 29 2017, 12:54 AM.

Description

Merge branch 'master' into frameworks

Merged Changes

CommitAuthorDetailsCommitted
77d300a5fdefandreask
add sweeper app icon instead of an action icon BUG: 373902 
Jan 4 2017