Update HYBRID MODE

Add Per App Layout

Change-Id: I257cdd859d77fb6573a828276e618693c1f6f5a9