Merge "Prevent npe when rotation button is not attached to screen"