Merge "Add test for tapjacking permission review screen"