Merge "Eagerly update fragment state when moving between states" into mnc-ub-dev