Merge "Maintain order in GlobalActions when rotating to/from seascape." into pi-dev