Merge "Fix bug 4361642 - Action menu unresponsive after orientation change"