Merge "Merge "Use the layout frame to decide whether to do a server sync" into tm-qpr-dev am: ea79cc5178 am: 9facea99c5"