Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev
am: ba4fad160d

Change-Id: Ie71d66f43e21821b0ccac003d02878f011e63f18