Merge "Try to get policy from intent extras" into main