Merge "Remove RemoteInput on lockscreen setting" into nyc-dev