Merge "Update caption toggle icon with GM2 icons used elsewhere in the system." into qt-dev