Merge pull request #17955 from justindarc/bug991813

Bug 991813 - [Camera] Zoom Bar jumps on orientation change
Merge pull request #17928 from justindarc/bug991354

Bug 991354 - [Camera][Madai] X in cancel button not centered. Pick activ...