Merge "Moving saving state transtion listener logic to individual views" into ub-launcher3-master