Merge "Fix progress spinner dialog in ApiDemos" into lmp-dev