Merge "Merge "Look at last used app when filtering." into nyc-dev am: ce289e937e am: 7c34fd3ccd" into nyc-mr1-dev-plus-aosp