Merge "Don't consider app as top app if alpha = 0" into oc-dev am: 4a2be133d4
am: 054a99d029

Change-Id: I00fa7330cb0f5452c1d1c11323cf13981c3355fb