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
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2