Merge "Allow bucket elevation for timed-out restricted apps." into sc-dev