Merge "SnapdragonCamera: Fix submenu icon not display in RTL"