Merge "Remove more unused statusbar.policy items."