Merge "Disable PS entry point and Activity when PS is not allowed." into main