Merge "[ATSPI] recover ForceUp failure" into devel/master