Merge "Don't keep screen on during read tag on locked screen"