Merge "Add new parameter capability to onUidStateChanged()"