add layout back in PSA and convert PIA to a normal TypedActivity