Merge "Update caption toggle icon with GM2 icons used elsewhere in the system." into qt-dev am: 9a5f74f0 am: c3c003d7 Change-Id: I7aa438ac40de44f49531e84b95981f5780894316