Merge "Use application context getting secondary displays." into oc-dev
am: 456882b5ae

Change-Id: Ib45a340b34f11f0112c91893893f32e0a849cf93