Merge "Do not set user active hints when Shell Transition is on." into sc-v2-dev