Merge "Remove dumpable container from SystemUIApplication" into udc-dev