Merge "Fix shade collapse on keyguard with bypass enabled" into tm-qpr-dev