Merge "Add flags for new unlock and smartspace transition." into sc-dev