Merge changes from topic "APC-stop-projection" into qt-dev
am: 5f061b52eb

Change-Id: Ie95d75792c7dedab56a016423e9965fb8ed59eed