After getting an update to rebind items after getting updates for protected components, strip empty screens

Change-Id: Ic269e7c8c233b34c8cdf638f2c794bd0e5bf668a
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0