Merge "Message list: fix auto-activation after leaving One At Time layout"