Merge "Check doze transition before attempting to getState()" into main