Trebuchet: AppsCustomizePagedView: Update tab from content type
when not using joined apps view

Change-Id: I2dcc8cf61a3b0ac301acffa5369b535a5b59e835
Merge "Trebuchet: AppsCustomizePagedView: Update tab from content type when not using joined apps view" into cm-10.2
Trebuchet : Live folder removeAll fix

Relayout folder in event that the folder is removed of all
its contents.
Also allow apps to clear folder contents.

Change-Id: Idb79d102fa26dcb1920fca18b9dfa3267baa94b0
Merge "Trebuchet : Live folder removeAll fix" into cm-10.2
Merge branch 'cm-10.2' into martincz