Merge "Disable background view after authenticated" into udc-d1-dev