Merge "Allow lockscreen orientation to be overridden with a system property."