Merge "Properly save/restore misc views. b/10515101." into jb-ub-mail-ur10