Merge "Converting padding container to framelayout" into udc-dev