Merge "Extended test to support launching assist above lock screen" into mnc-dev