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

Change-Id: I291e1249e9e0b5a975faade4ee105b3e6711db67