Merge "New "frozen" state during app move/upgrade." into mnc-dev