Merge "Use application context getting secondary displays." into oc-dev