Merge "Split up MODE_SHOW_BOUNCER and MODE_UNLOCK_COLLAPSING" into sc-dev