Moving apps search related logic into a custom layout file
am: 161f96bc77

Change-Id: I241eccb4d07ecb4057184ae2861c9e748186323f