Merge "Add ui tests for restrict app tips" into pi-dev