Merge "Remove old show/hide messages on new ime (DO NOT MERGE)" into jb-mr2-dev