Merge "Updated btn_default and btn_toggle assets Bug: 5076695"