Merge "Don't reset message view when becoming active again."