Merge "Hides app buttons for instant apps" into oc-dev
am: 965508fc3e

Change-Id: I6158a7d6f96ea144b16cda70fe1ed9fb989c5d8d