Merge "Adding support for overriding app-awidget properties at runtime"