Merge "Only set property state after back button instantiated" into sc-v2-dev