Merge "SmartNav: Bring back Kill App action" into p9.0