Merge "Don't relayout app contents when just changing app position"