[automerger skipped] Merge changes from topic "screenshot-fd-optional-qt-dev" into qt-dev
am: 085528db -s ours
am skip reason: change_id I1719899e6cf3bffe1a96849691c051ff4f3a05ec with SHA1 006a6bb2 is in history
Change-Id: If05130d84704599346a0345d0d39d8e15d7f744f