Merge "Restore StatusBarStatePolicy." into sc-v2-dev