Merge "IllegalStateException fixed in print service settings" into lmp-mr1-dev