Merge "Allow activities on secondary displays to dismiss keyguard"