Merge changes from topic "face-bypass-move" into qt-r1-dev am: ffcc25ba92
am: db00ff2165

Change-Id: I9a93753fd094d8a3634c17e18c8b1900d4632312