Merge "Disable color sampling while navigation bar is hidden" into qt-dev
am: 0eefbef6bb

Change-Id: Id1147a1d43001b7a40c404765fbb064c5931ac76